Split igc, gpssim, garmin_txt into test entries of their own.

diff --git a/gpsbabel/testo.d/classic-2.test b/gpsbabel/testo.d/classic-2.test
index 5829a3c769ef967f80b1ea099b11f591bf8d6943..98247f3f21dd3c332b5fd56b7938c797636b1327 100644 (file)
--- a/gpsbabel/testo.d/classic-2.test
+++ b/gpsbabel/testo.d/classic-2.test
@@ -148,36 +148,6 @@ rm -f ${TMPDIR}/netstumbler.mps
 gpsbabel -i netstumbler -f ${REFERENCE}/netstumbler.txt -o mapsource -F ${TMPDIR}/netstumbler.mps
 bincompare ${TMPDIR}/netstumbler.mps ${REFERENCE}/netstumbler.mps
 
-#
-# IGC tests
-#
-rm -f ${TMPDIR}/igc*out
-gpsbabel -i gpx -f ${REFERENCE}/igc1.gpx -o igc -F ${TMPDIR}/igc.out
-sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
-compare ${TMPDIR}/igc_sed.out ${REFERENCE}/igc1_igc.out
-
-gpsbabel -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx
-compare ${TMPDIR}/igc.gpx ${REFERENCE}/igc1_gpx.out
-
-gpsbabel -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out
-sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
-compare ${TMPDIR}/igc_sed.out ${REFERENCE}/igc1_igc.out
-
-gpsbabel -i gpx -f ${REFERENCE}/igc1_baro.gpx -i igc -f ${REFERENCE}/igc1_igc.out -o igc,timeadj=auto -F ${TMPDIR}/igc.out
-sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
-compare ${TMPDIR}/igc_sed.out ${REFERENCE}/igc1_3d.out
-
-
-gpsbabel -i igc -f ${REFERENCE}/igc2.igc -o gpx -F ${TMPDIR}/igc.gpx
-compare ${TMPDIR}/igc.gpx ${REFERENCE}/igc2_gpx.out
-
-gpsbabel -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out
-sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
-compare ${TMPDIR}/igc_sed.out ${REFERENCE}/igc2_igc.out
-
-gpsbabel -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx
-compare ${TMPDIR}/igc.gpx ${REFERENCE}/igc2_gpx.out
-
 #
 # Google Maps XML test
 #

diff --git a/gpsbabel/testo.d/classic-3.test b/gpsbabel/testo.d/classic-3.test
index 9482f2244175f036f3f1f93edad028f8e2b8118e..b7e833e37246b754ff2e789d41c9e1e4e02c3317 100644 (file)
--- a/gpsbabel/testo.d/classic-3.test
+++ b/gpsbabel/testo.d/classic-3.test
@@ -102,21 +102,6 @@ compare ${TMPDIR}/amod-pure ${REFERENCE}/track/amod-cleansed
 gpsbabel -i wfff -f ${REFERENCE}/wfff.xml -o gpsutil -F ${TMPDIR}/wfff.gpu
 compare ${TMPDIR}/wfff.gpu ${REFERENCE}/wfff.gpu
 
-#
-# Garmin MapSource tab delimited text files - garmin_txt
-#
-rm -f ${TMPDIR}/garmin_txt*
-#
-# !!! garmin_txt timestamps are stored in localtime !!!
-#
-gpsbabel -i gdb -f ${REFERENCE}/gdb-sample2.gdb -o garmin_txt,utc,prec=9 -F ${TMPDIR}/garmin_txt.txt
-compare ${REFERENCE}/garmin_txt.txt ${TMPDIR}/garmin_txt.txt 
-gpsbabel -i garmin_txt -f ${REFERENCE}/garmin_txt.txt -o garmin_txt,prec=9 -F ${TMPDIR}/garmin_txt-2.txt
-gpsbabel -i garmin_txt -f ${TMPDIR}/garmin_txt-2.txt -o garmin_txt,prec=9 -F ${TMPDIR}/garmin_txt-3.txt
-#
-# test can fail because of localtime/gmtime differences
-# 
-## compare ${TMPDIR}/garmin_txt-2.txt ${TMPDIR}/garmin_txt-3.txt
 
 #
 # hiketech tests
@@ -150,14 +135,6 @@ rm -f ${TMPDIR}/axim-*
 gpsbabel -i axim_gpb -f ${REFERENCE}/track/axim-sample.gpb -o gpx -F ${TMPDIR}/axim-sample.gpx
 compare ${REFERENCE}/track/axim-sample.gpx ${TMPDIR}/axim-sample.gpx
 
-#
-# Franson GPSGate simulation
-#
-gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o gpssim -F ${TMPDIR}/waypoints.gpssim
-compare ${TMPDIR}/waypoints.gpssim ${REFERENCE}
-gpsbabel -i gpx -f ${REFERENCE}/track/tracks.gpx -o gpssim -F ${TMPDIR}/tracks.gpssim
-compare ${TMPDIR}/tracks.gpssim ${REFERENCE}/track
-
 #
 # WBT-200 tests
 #

diff --git a/gpsbabel/testo.d/garmin_txt.test b/gpsbabel/testo.d/garmin_txt.test
new file mode 100644 (file)
index 0000000..934bd7f
--- /dev/null
+++ b/gpsbabel/testo.d/garmin_txt.test
@@ -0,0 +1,15 @@
+#
+# Garmin MapSource tab delimited text files - garmin_txt
+#
+rm -f ${TMPDIR}/garmin_txt*
+#
+# !!! garmin_txt timestamps are stored in localtime !!!
+#
+gpsbabel -i gdb -f ${REFERENCE}/gdb-sample2.gdb -o garmin_txt,utc,prec=9 -F ${TMPDIR}/garmin_txt.txt
+compare ${REFERENCE}/garmin_txt.txt ${TMPDIR}/garmin_txt.txt 
+gpsbabel -i garmin_txt -f ${REFERENCE}/garmin_txt.txt -o garmin_txt,prec=9 -F ${TMPDIR}/garmin_txt-2.txt
+gpsbabel -i garmin_txt -f ${TMPDIR}/garmin_txt-2.txt -o garmin_txt,prec=9 -F ${TMPDIR}/garmin_txt-3.txt
+#
+# test can fail because of localtime/gmtime differences
+# 
+## compare ${TMPDIR}/garmin_txt-2.txt ${TMPDIR}/garmin_txt-3.txt

diff --git a/gpsbabel/testo.d/gpssim.test b/gpsbabel/testo.d/gpssim.test
new file mode 100644 (file)
index 0000000..d441ea6
--- /dev/null
+++ b/gpsbabel/testo.d/gpssim.test
@@ -0,0 +1,7 @@
+#
+# Franson GPSGate simulation
+#
+gpsbabel -i geo -f ${REFERENCE}/../geocaching.loc -o gpssim -F ${TMPDIR}/waypoints.gpssim
+compare ${TMPDIR}/waypoints.gpssim ${REFERENCE}
+gpsbabel -i gpx -f ${REFERENCE}/track/tracks.gpx -o gpssim -F ${TMPDIR}/tracks.gpssim
+compare ${TMPDIR}/tracks.gpssim ${REFERENCE}/track

diff --git a/gpsbabel/testo.d/igc.test b/gpsbabel/testo.d/igc.test
new file mode 100644 (file)
index 0000000..11dd2d7
--- /dev/null
+++ b/gpsbabel/testo.d/igc.test
@@ -0,0 +1,29 @@
+#
+# IGC tests
+#
+rm -f ${TMPDIR}/igc*out
+gpsbabel -i gpx -f ${REFERENCE}/igc1.gpx -o igc -F ${TMPDIR}/igc.out
+sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
+compare ${TMPDIR}/igc_sed.out ${REFERENCE}/igc1_igc.out
+
+gpsbabel -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx
+compare ${TMPDIR}/igc.gpx ${REFERENCE}/igc1_gpx.out
+
+gpsbabel -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out
+sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
+compare ${TMPDIR}/igc_sed.out ${REFERENCE}/igc1_igc.out
+
+gpsbabel -i gpx -f ${REFERENCE}/igc1_baro.gpx -i igc -f ${REFERENCE}/igc1_igc.out -o igc,timeadj=auto -F ${TMPDIR}/igc.out
+sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
+compare ${TMPDIR}/igc_sed.out ${REFERENCE}/igc1_3d.out
+
+
+gpsbabel -i igc -f ${REFERENCE}/igc2.igc -o gpx -F ${TMPDIR}/igc.gpx
+compare ${TMPDIR}/igc.gpx ${REFERENCE}/igc2_gpx.out
+
+gpsbabel -i gpx -f ${TMPDIR}/igc.gpx -o igc -F ${TMPDIR}/igc.out
+sed '/^LXXXGenerated by GPSBabel Version/d' ${TMPDIR}/igc.out > ${TMPDIR}/igc_sed.out
+compare ${TMPDIR}/igc_sed.out ${REFERENCE}/igc2_igc.out
+
+gpsbabel -i igc -f ${TMPDIR}/igc.out -o gpx -F ${TMPDIR}/igc.gpx
+compare ${TMPDIR}/igc.gpx ${REFERENCE}/igc2_gpx.out

diff --git a/gpsbabel/testo.d/mainnav.test b/gpsbabel/testo.d/mainnav.test
index 2f4f8406f863078a27a1fd9d20ce67182048f7fb..2f340a832711ed7eacd66e7bf4e816829f989765 100644 (file)
--- a/gpsbabel/testo.d/mainnav.test
+++ b/gpsbabel/testo.d/mainnav.test
@@ -4,5 +4,5 @@
 # Mainnav tests
 #
 gpsbabel -i mainnav -f ${REFERENCE}/track/mainnav_mg-950d.nav -o gpx -F ${TMPDIR}/mainnav_mg-950d.gpx
-compare ${TMPDIR}/mainnav_mg-950d.gpx ${REFERENCE}/track/mainnav_mg-950d.gpx
+compare ${REFERENCE}/track/mainnav_mg-950d.gpx ${TMPDIR}/mainnav_mg-950d.gpx